From f0b36257f4dc6708757d5b18a87a16d04e9a0255 Mon Sep 17 00:00:00 2001
From: "cl349@firebug.cl.cam.ac.uk" <cl349@firebug.cl.cam.ac.uk>
Date: Thu, 2 Jun 2005 20:46:08 +0000
Subject: [PATCH] bitkeeper revision 1.1651 (429f70102tptpkVKU9_mkUC4olK_-Q)

Many files:
  More include cleanups towards "include where it's used".
sched.h:
  g/c unneeded include.
  include xen/spinlock.h once should be enough.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
---
 xen/arch/x86/acpi/boot.c          | 2 +-
 xen/arch/x86/i387.c               | 1 +
 xen/arch/x86/microcode.c          | 1 +
 xen/arch/x86/nmi.c                | 2 +-
 xen/arch/x86/x86_32/asm-offsets.c | 1 +
 xen/arch/x86/x86_32/seg_fixup.c   | 1 +
 xen/arch/x86/x86_64/asm-offsets.c | 1 +
 xen/common/kernel.c               | 1 +
 xen/include/xen/event.h           | 1 +
 xen/include/xen/sched.h           | 2 --
 10 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 19f6147648..5b25f53cd5 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -28,7 +28,7 @@
 #include <xen/init.h>
 #include <xen/acpi.h>
 #include <xen/irq.h>
-#include <xen/sched.h>
+#include <asm/fixmap.h>
 #include <asm/page.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c
index b859e74110..bc75be99a5 100644
--- a/xen/arch/x86/i387.c
+++ b/xen/arch/x86/i387.c
@@ -10,6 +10,7 @@
 
 #include <xen/config.h>
 #include <xen/sched.h>
+#include <asm/current.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 
diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
index 6e47acea3f..83dd5c3501 100644
--- a/xen/arch/x86/microcode.c
+++ b/xen/arch/x86/microcode.c
@@ -74,6 +74,7 @@
 #include <xen/kernel.h>
 #include <xen/init.h>
 #include <xen/sched.h>
+#include <xen/smp.h>
 #include <xen/spinlock.h>
 
 #include <asm/msr.h>
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index c5728be7bc..9357374381 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -21,8 +21,8 @@
 #include <xen/time.h>
 #include <xen/sched.h>
 #include <xen/console.h>
+#include <xen/smp.h>
 #include <asm/mc146818rtc.h>
-#include <asm/smp.h>
 #include <asm/msr.h>
 #include <asm/mpspec.h>
 #include <asm/debugger.h>
diff --git a/xen/arch/x86/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c
index efc4aa3ecf..c4444a5cb3 100644
--- a/xen/arch/x86/x86_32/asm-offsets.c
+++ b/xen/arch/x86/x86_32/asm-offsets.c
@@ -7,6 +7,7 @@
 #include <xen/config.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>
+#include <asm/fixmap.h>
 #include <asm/hardirq.h>
 
 #define DEFINE(_sym, _val) \
diff --git a/xen/arch/x86/x86_32/seg_fixup.c b/xen/arch/x86/x86_32/seg_fixup.c
index 06912b3a2a..b15eb9c3f6 100644
--- a/xen/arch/x86/x86_32/seg_fixup.c
+++ b/xen/arch/x86/x86_32/seg_fixup.c
@@ -27,6 +27,7 @@
 #include <xen/errno.h>
 #include <xen/mm.h>
 #include <xen/perfc.h>
+#include <asm/current.h>
 #include <asm/processor.h>
 #include <asm/regs.h>
 #include <asm/x86_emulate.h>
diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c
index 29e3808736..ff2855aeee 100644
--- a/xen/arch/x86/x86_64/asm-offsets.c
+++ b/xen/arch/x86/x86_64/asm-offsets.c
@@ -7,6 +7,7 @@
 #include <xen/config.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>
+#include <asm/fixmap.h>
 #include <asm/hardirq.h>
 
 #define DEFINE(_sym, _val) \
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index d577cbc2a0..3acaac8e1b 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -13,6 +13,7 @@
 #include <xen/errno.h>
 #include <xen/compile.h>
 #include <xen/sched.h>
+#include <asm/current.h>
 
 void cmdline_parse(char *cmdline)
 {
diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index 306883c594..2ae5d94895 100644
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -11,6 +11,7 @@
 
 #include <xen/config.h>
 #include <xen/sched.h>
+#include <xen/smp.h>
 #include <asm/bitops.h>
 
 /*
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index e5a6f0d4af..6d948e7b51 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -9,8 +9,6 @@
 #include <xen/smp.h>
 #include <public/xen.h>
 #include <public/dom0_ops.h>
-#include <xen/list.h>
-#include <xen/spinlock.h>
 #include <xen/grant_table.h>
 #include <asm/domain.h>
 
-- 
2.30.2